Merge version 10.48-3+rpi1 and 10.48-3.1 to produce 10.48-3.1+rpi1

diff --cc debian/changelog
index 62a512eaf5bccd5fa2d6c2d08166b5c7185ba61b,44acbd551cdbff925152b638d93137a62b09c7c7..d6f1241cb3d5801435531e09f63ca9d86c2bfdab
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- pcre2 (10.48-3+rpi1) forky-staging; urgency=medium
++pcre2 (10.48-3.1+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 10.44-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 28 Nov 2024 18:34:35 +0000]
 +  * Disable JIT on armhf, it's tests fail on raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 06 Oct 2026 18:27:57 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 10 Oct 2026 04:28:20 +0000
++
+ pcre2 (10.48-3.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * GHSA-r9hj-j2rw-4q3m: Fix large JIT stack allocation (Closes: #1149217)
+   * For release, revert platform-specific test case
+ 
+  -- Salvatore Bonaccorso <carnil@debian.org>  Mon, 28 Sep 2026 16:04:18 +0200
  
  pcre2 (10.48-3) unstable; urgency=medium